build: Drop CONFIG_SPL_BUILD guards in some cases

Given gcc-6.1 and later we can now safely have strings discarded when
the functions are unused.  This lets us drop certain cases of not
building something so that we don't have the strings brought in when the
code was discarded.  Simplify the code now by dropping guards we don't
need now.

Cc: Stefano Babic <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Chander Kashyap <[email protected]>
Cc: Thomas Abraham <[email protected]>
Cc: Vipin Kumar <[email protected]>
Cc: Wenyou Yang <[email protected]>
Signed-off-by: Tom Rini <[email protected]>

diff --git a/arch/arm/cpu/arm1136/mx31/Makefile b/arch/arm/cpu/arm1136/mx31/Makefile
index dcbd57065bbc239ee582a765180b1a89d619d6f8..774f352ece81735ab735d37e297fdf27e83390a9 100644 (file)
--- a/arch/arm/cpu/arm1136/mx31/Makefile
+++ b/arch/arm/cpu/arm1136/mx31/Makefile
@@ -8,7 +8,4 @@
 obj-y  += generic.o
 obj-y  += timer.o
 obj-y  += devices.o
-
-ifndef CONFIG_SPL_BUILD
-obj-y  += relocate.o
-endif
+obj-y  += relocate.o

diff --git a/arch/arm/cpu/arm1136/mx35/Makefile b/arch/arm/cpu/arm1136/mx35/Makefile
index 796db9c7cc7525903d7e76f3089abd95e1572bfd..e4c8e2e6849a900e4513467542927946149e80d6 100644 (file)
--- a/arch/arm/cpu/arm1136/mx35/Makefile
+++ b/arch/arm/cpu/arm1136/mx35/Makefile
@@ -10,7 +10,4 @@
 obj-y  += generic.o
 obj-y  += timer.o
 obj-y  += mx35_sdram.o
-
-ifndef CONFIG_SPL_BUILD
-obj-y  += relocate.o
-endif
+obj-y  += relocate.o

diff --git a/arch/arm/cpu/arm926ejs/mx25/Makefile b/arch/arm/cpu/arm926ejs/mx25/Makefile
index ebc0407ef42abd86e7936e34acd1d0ea3470daa4..7d608c608255ce70f6b7df965fe7c0203f311aee 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mx25/Makefile
+++ b/arch/arm/cpu/arm926ejs/mx25/Makefile
@@ -4,8 +4,4 @@
 #
 # SPDX-License-Identifier:     GPL-2.0+
 
-obj-y  = generic.o timer.o reset.o
-
-ifndef CONFIG_SPL_BUILD
-obj-y  += relocate.o
-endif
+obj-y  += generic.o timer.o reset.o relocate.o

diff --git a/arch/arm/cpu/arm926ejs/mx27/Makefile b/arch/arm/cpu/arm926ejs/mx27/Makefile
index 0edf1445fe364c19e8b00efd0f499783d245b114..7d608c608255ce70f6b7df965fe7c0203f311aee 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mx27/Makefile
+++ b/arch/arm/cpu/arm926ejs/mx27/Makefile
@@ -4,8 +4,4 @@
 #
 # SPDX-License-Identifier:     GPL-2.0+
 
-obj-y  = generic.o reset.o timer.o
-
-ifndef CONFIG_SPL_BUILD
-obj-y  += relocate.o
-endif
+obj-y  += generic.o timer.o reset.o relocate.o

diff --git a/arch/sandbox/lib/Makefile b/arch/sandbox/lib/Makefile
index 2e7802feac8a99b7dfcee72a267b5e77c0808bc0..a79ade7b1102bbe7a0f8d8adda37019dc241aa19 100644 (file)
--- a/arch/sandbox/lib/Makefile
+++ b/arch/sandbox/lib/Makefile
@@ -8,8 +8,6 @@
 #
 
 obj-y  += interrupts.o
-ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_PCI)      += pci_io.o
-endif
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 obj-$(CONFIG_CMD_BOOTZ) += bootm.o

diff --git a/board/atmel/common/Makefile b/board/atmel/common/Makefile
index 8a6850bc198b016f852b81c80e676acb3c669d5e..f68dd74953ed2f25898f1d81523a1f91be606609 100644 (file)
--- a/board/atmel/common/Makefile
+++ b/board/atmel/common/Makefile
@@ -6,7 +6,5 @@
 #
 
 obj-y += board.o
-ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_I2C_EEPROM) += mac_eeprom.o
 obj-$(CONFIG_DM_VIDEO) += video_display.o
-endif

diff --git a/board/samsung/arndale/Makefile b/board/samsung/arndale/Makefile
index be2b3662ade637e12102a630b85f35799c1926d0..01bbc0798ac9b338875c9c1ecce5b33c581b837b 100644 (file)
--- a/board/samsung/arndale/Makefile
+++ b/board/samsung/arndale/Makefile
@@ -5,7 +5,4 @@
 #
 
 obj-y  += arndale_spl.o
-
-ifndef CONFIG_SPL_BUILD
 obj-y  += arndale.o
-endif

diff --git a/board/samsung/espresso7420/Makefile b/board/samsung/espresso7420/Makefile
index d514dc2a457aa3f6b8a60077cb251173bbc121ff..5248265b1f19769f028215f3b7964f2369f435ef 100644 (file)
--- a/board/samsung/espresso7420/Makefile
+++ b/board/samsung/espresso7420/Makefile
@@ -5,6 +5,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-ifndef CONFIG_SPL_BUILD
 obj-y  += espresso7420.o
-endif

diff --git a/board/spear/spear600/Makefile b/board/spear/spear600/Makefile
index 7abfb9ad50ad38d48f6b5e9af88d7656f3e02723..86a7fc4c7eda891a62b21c4da12abc44026102b0 100644 (file)
--- a/board/spear/spear600/Makefile
+++ b/board/spear/spear600/Makefile
@@ -5,6 +5,4 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-ifndef CONFIG_SPL_BUILD
-obj-y  := spear600.o
-endif
+obj-y  += spear600.o